Two minor stylistic fixes requested by @jcoyne