Some refinements working toward adding method level patching.