Cleaned up the Var Storage a bit and got the asserts working (first pass).