Cleanup.
Add some commented-out flags for profiling.