Clean up pre-processor directives as requested by John Ford's comments on my pull request.