Remove unused variable resulting from code simplification in
d191ff78.