Clean up preprocessor ID junk

--HG--
extra : rebase_source : 23fa7c2112b143c579ada1b1b96d11cfcfd0034a