Fix a bunch of whitespace problems
Fix rval scoping for WHERE expressions with multiple subexprs