Minor stylistic cleanups.