Having a kind (as requested at line 623) will simplify all that.