Refactor: simplify VarDef (close #84)