Cleaned up some junk from the patch forward.