Makes branch/stop rewriting aware of incoming branches
Makes branch/stop rewriting aware of incoming branches

Tries to avoid rewriting if it will confuse other branches

katef/libfsm,katef/libfsm,katef/libfsm,katef/libfsm,katef/libfsm