Some refactoring of templates involved in splitting personnel along the salaried/funded dichotomy.