We're doing a mostly good job, but a few bits and pieces could be even better. This bug will wrap up a few of those.
Let's call this done.