Simplify branch setup for resolved goal