Consolidate version handling, reduce number of templates to maintain.