Remove two patches no longer necessary.
Tested with 84i386-gcc48 and 100amd64-clang33