I agree. Let me take care of this in a separate pull request.