r24912: Merge 'use more substituted variables' patch to release branch.