Slight speedup.
Cleanup.