Fix a bug where our Motif ICE candidates were not quite proper, and make us more...