Even better solution-picking

This fixes a couple sloppy bugs introduced in the last commit.