Intercept isa on Lazy objects.
Fix variation tables after factory changes. Oops!
Merge branch 'dev'