Now does checks up front, and is faster (due to enforcement of ese of WBVars)