Fixed handling of bindings and simple "code" types