Clean up.

Cleaned up a bit, and moved the timing logic to the Comp V Comp code,
since that's the only place it's used.