Use consistent variable names for suggested expressions

Now hole results almost work. Making inferredExpr based on fConsistentExpr rather than fWrittenExpr seems to make all work right.