MergeTileStore cleanup and improvements