I agree, this looks a bit better. I made pull requests for these: https://github.com/buildbot/buildbot/pull/926, https://github.com/buildbot/buildbot/pull/927.