Merge pull request #2563 from alex/crl-iter-perf

Simplify implementation of CRL indexing and iteration.