Misc. changes supporting a shift from if statements to ifdefs.