Start reducing amount of ifdefs between X432R code and non-X432R code