Clean up Intervals a bit, and fix some issues.