Merge pull request #2440 from reaperhulk/small-cleanups

Some CRL cleanups