Improve remapping order.

Keeping that streak going.