g10: Improve TOFU batch update code.