This could cause broken relays to be generated depending on the order of the entry points in the relay list. Also add a few missing tabs in the assembly output.