Adds prefixing, improves pre- and post-fix regex