My only fear with this style of multiple-items-per-line is that it's easy to miss seeing one, and double add it, remove it, or otherwise mess up this order.  The file is already massive, why not split these 1-per-line, and same with function signature below, to match?