Simplifications.
Fix ambiguity in vardecl assignment.