"handle" some more cases.