diff --git a/tile.c b/tile.c
index f7f79ea845..cc54d13747 100644
--- a/tile.c
+++ b/tile.c
@@ -4,14 +4,13 @@
 void SetMapExtraBits(TileIndex tile, byte bits)
 {
 	assert(tile < MapSize());
-	_map_extra_bits[tile >> 2] &= ~(3 << ((tile & 3) * 2));
-	_map_extra_bits[tile >> 2] |= (bits&3) << ((tile & 3) * 2);
+	SB(_map_extra_bits[tile >> 2], (tile & 3) * 2, 2, bits & 3);
 }
 
 uint GetMapExtraBits(TileIndex tile)
 {
 	assert(tile < MapSize());
-	return (_map_extra_bits[tile >> 2] >> (tile & 3) * 2) & 3;
+	return GB(_map_extra_bits[tile >> 2], (tile & 3) * 2, 2);
 }