Simplify Def fields: remove Callable, make Kind language-specific