minor #21615 Fix syntax errors/warnings in 7.3 (wouterj)

minor #21615 Fix syntax errors/warnings in 7.3 (wouterj) #26047