Oh, yea, that is much nicer -- let me update the pull request.