Reorder rules for consistency, add minor rules for some/ind.