Re-ordered definitions in file to follow eager -> lazy. Removed #defines...

... and replaced with scoped consts