[misc] Use new internal template macro instead