BUGFIX: Template control statements updated for 3.1.