Minor refactor from AST to tunit