better handling of use/decl in branches