I think I'll just move all the patches out to the method level.