Fix some bugs from the merge with master

 * Figure out what the right choice for the kind checking strategy of kind decls
   should be