Converted more hacks to patches.