c.c: Use separate DKinds

Also update D unit test.

Replaces #157.