I'd muddled up my macro languages and misremembered that GNU as handles
omitted macro arguments sensibly. So use default argument values
throughout. Some of the macro arguments have been reordered to make
defaulting work better. No functional change.