completed expr/stmt unification