Remove old ifdefs for supporting base<4 since we require base>=4