Self-review plus test fix.