Fixup BUILD dep sort and >100 cols.