Let's make some more minor changes while we're at it.