actually fix PR 14102

This commit definitely takes the position that
"beautiful" code is less important than reasonable
error messages; better if the code were refactored
so the names flow through it more gracefully