ENH:  Final clean-up of registration-to-template issues.