Handle some more cases less poorly