Code refactoring and cleanup related to SGF-207 and SGF-254, Region Templates.