Small cleanups - #381.