Merge pull request #719 from nathantsoi/cleanup/defines