The reason for the restructure in this section is purely due to ease of edit.  I grep'ed through the file for all instances of "emit" to find all relevant signals and the new order of inclusion simply matches the order of the grep results.