Update templates for new blocks-with-arguments system.