Macros part 2

Adds a few fixes that did not get into the earlier Macros commit.