Replace procedure-rename with eta-expansion.

Closes PR 14612.