Partial cleanup of sequence impl