Closing since the mapping is arguable to begin with and there seems to be no interest in contributing a fix.