Adjustments to Map.rotate() based on @Cadair's suggestions