Fix non-decl assignment