Further code style improvements.