Always unify var dependencies
General fixes. All specs pass.