Further in the refactoring; improved the tile-map related directives.