There are two leftover unused variables. Remove them and clean up the
fallout of the change.