Fix more refactoring errors.