Misc cleanup & leveraging cached `RegExp` objects from abaaso