Unify assign syntax: bugfixes