Incorrect macro usage replaced by explicit calls.

Waiting for new templates in Machinist.