Adding functions/typedefs to cover Node/Var inconsistencies