Unified variables and bound variables
Merge branch 'bindings'