Minor code style improvements.