Minor code readability improvements.