Seems to be working the way I intended.
ol_content_type and ol_expiration now delete keys if they have expired
as well.
Various small bugfixes. GOOD ENOUGH!