[jhc] darcs patch: Fix kind inference + test (and 1 more)