Handle some more cases.