Some more minor readability improvements.