Switch to a single kind node

Summary

This might be sufficient

/cc @mlinhoff