before changing where var x = { ... } is handled
complex rhs solved for most sane cases