Cleaned up regex interface.