choice axiom is now in the classical namespace.
This commit also replaces many occurrences of 'binders' with 'binder'.