Renaming handle to better match NME
Switching to val_to_kind and improving type checking