Fix 575

This is what you had suggested, plus binding candidate-number-limit to 9999.  Works well for me.