As per irc, let's file this and improve in follow-up bugs.