Agreed.  Taking out the option.  Will leave the regexp export, though: it does improve testability.  This still makes it overridable should the need arise.