A few small cleanups to r187504. Thanks to dblaikie for the assist.