Found an even more elegant way of fixing the pre-processor.