(#1889) - more websql perf improvements

Trying to get some numbers to back this one up, but it's really starting to get into micro-optimization territory.  Might have to sell it to you based on simplification alone.