Refactor: Cleaned up map geometry construction somewhat

Added precondition assertions and effected some rename refactorings
so that we can again see the wood for the trees...

This'll do for now.