Fix TO_MAP_BLOCK() taking offset into account twice