Change a few more readability issues.