This caused too many edge cases. Will work on optimizing the one-pass index instead (not part of this commit).