Minor stylistic fixes to the previous commits.