Merge pull request #296 from lzmths/master Refactoring conditional directives that break parts of statements.