Shane and I went around for a while talking about how to tweak this, see http://irclog.gr/#show/irc.mozilla.org/identity/303278 if interested. I'm sure another PR will materialize any moment.