Map.h redux

Cleaned up.