Defactor/tidy var/def builtins