More regexp tweaks.