Fixing collisions between scalars and expressions.

This is a problem in the Akiban Server when you do something like { "id" : 1, "@fields" : all}. before this branch, this would result in the SQL mentioning "id" twice.