Rearranges the interval files.
Removes some dependencies on RXFastEnumerationState.