Add new_variable_full

Route everything through that.
Add new_variable_enum

This seems to work. Yay.