More small stylistic fixes/improvements.