Update the map code.
A number of cpp-check cleanups.
CPP check.
Whitespace.