jperkin reported a bootstrapping failure in the newer pre-processor conditionals, so revert to the older, less comprehensive versions without gcc version level checks.
