+1 Sounds nicer. I've reworked the commit.