Another big cleanup of useless ifdefs.

Note that this is a noop as the code after precompilation did not change. This has been double checked.