Fix issue with macro substitution if it's the first thing after the step type