Fix to compile with 7.4.x too
Preparing for v0.7.0.5
Working on more intricate CPP solution. Must preserve the parts excluded
by the preprocessor on a given run.