Removing make-regexp dependency.