Regex check every admit entry, slow but needed for backwards compatibility

Also various small cleanups.