Slight regexp modifications.