More client-side maps related refactorings.