Incorporating bindings-DSL fixes from Greg Hale.