NFC: remove unused variables from r203938, r203942, and r203947