Fix constant tuple regression in macro expansion
Also improves error messages when non-constant is used with macros
Modify test to exercise the const-tuple marco
Enhance testing for macro support
Fix test
Deduplicate macro shape checking code
Merge pull request #867 from sklam/fix_tuple_constant

Fix tuple constant in macro