Minor refactoring of TilesGuarded trait