Re-jig ordering of constants; update template placeholder var names.