Reduce some more last X432R compile-time ifdefs