More maps refactoring / cleanup.