Fix issue where named arguments in macros do not work with template inheritance.