KIJIMR-58. Space-separated map parser.

Some other minor cleanups.