Remove redundant option
Fixup of previous commit
Have regexp search use perl-style regexp
Change log formatting