Fixup most line limit violations