Fix regression.
Cleanup.