#18798: merge typo fix from 3.3 and also use two unused variables.