Cleaning up map apply logic.