Templates entered in function short-form now have their arguments extracted and added to the Modelled argument.