That's definitely more explicit, which is probably a good thing. It's pretty unrelated to this pull request, though. What I'll do is submit a separate pull request for that change and then rebase this one once it lands.