More work on templates m4.