Removed obsolete CPP macros.
Minor refactoring.