Bug fixes (and improved candidate ordering) to the recent enhancement of numerical abduction. A bit of tests cleanup.