I agree.  We can leave this change to a separate pull-request.