Make `macro` optional

[ike709]

Resolves #1996

I tested that this removes the exception by nuking the macro from testgame.

I did not test whether this fix requires move involved changes to the active macro set.