A bit of internal code cleanup
Adding a reverse option to mappings