Continue refactoring imagemap methods

This is much easier to follow.