make sure multiple cases in macro definitions are working

Code to support is in place but not well tested yet.