Get rid of more X432R ifdefs