Improve heuristic DBIC settings parser, it considers extra options now.