Uses simpler method names in RegexpPatch class.
Move patch definitions to PatchCollection.