While we're doing VersionedPolicy, we probably want to take the opportunity to clean up some stuff about how we do certs.

Some thoughts: