Do not use un-annotated bindings

Second attempt at fixing #26. This time the test is less fragile, using its own data structures, and I think the fix is in the right place.