Resolve some FIXMEs
Drop regex-compat dependency