More misc improvements to prompt rendering (strip out default branch name, simplify a couple things)