Some refactoring of the binding parser.