Unify TileSystem. Fixes #106