I already merged this, but I like your suggestion. A PR to master would surely be rapidly included... =)