More unnecessary pre-processor directives removed.