Minor post-pull-request cleanups.