[jhc] darcs patch: Remove duplicate case in kiType (and 1 more)