Clean up a bit more and enable ignorecase again.