transition vars removed, plus a fix for Model sometimes being an unevaluated lazy reference