Minor cleanup

I'm in the process of doing some larger refactoring, but in the meantime I figured I'd try to push these upstream.