Improved support for BinaryCandidates