Slightly expanded candidate generation to handle Steve Miller's submode example