Minor pedantic cleanups