Stopped being over-eager about emitting where
Got cleverer about specifying the branch

We basically need to specify the branch once and only once for things to
work right.