Isn't there some way you can avoid duplicating this code in both of these changesets, make it a utility method or factor it out into a superclass for them