#872 Replace #defines with const values

Starting the PR off for this. There are many more 'macro' constants that are outside of Constants.h