I agree with you that your changes are the proper one to do. I've done this fix for the next intermediate release (see rev#76955).