SystemMacros: fixed for use in included templates