Refactor Patch.h

I have no idea what this is for; it can be safely removed without any
problems. I'll leave it in anyway.