Clean up Intervals a bit, and fix some issues.
Clean up Intervals a bit, and fix some issues.

adampingel/spire,guersam/spire,AlecZorab/spire,siddhartha-gadgil/spire,tixxit/spire,non/spire,AlecZorab/spire,woparry/spire,tixxit/spire,siddhartha-gadgil/spire,codeaudit/spire,codeaudit/spire,woparry/spire,rklaehn/spire,adampingel/spire,guersam/spire,kevinmeredith/spire,JackSullivan/spire,kevinmeredith/spire,JackSullivan/spire,non/spire,rklaehn/spire