Jim Monte - 2019-12-10

Code for this patch can be found in branch beta_jdm.

commit 8a33161432bf454260f9aa0d883fd03d2e1116d7
Date:   Mon, 9 Dec 2019 23:52:41 -0500

    Cleaned up defintions of macro constants