Patch cleanups

2 patches that we could likely or even very likely dismiss.