More minor code cleanups suggested via IRC. Thanks to all!