Prepare for removal of FEAT_WALL_*