Remove 'candidate == null' checks where possible and appropriate (only one left now and that is OK)