Minor code-style improvements.