Fix more regexp bugs.