More work on TilemapReader.
Cleanup.