More ls cleanups from squinting at Jose's most recent smack patch.

More ls cleanups from squinting at Jose's most recent smack patch.

Behavior change in flags: allow -long to work together, and -l1 work like -l
not -1.

I didn't make ls -gCl remember the g, though. (Because -Cg and -gC take
the last one: I'll preserve explicit state but not implicit state. And if
-1Cl and -lC1 aren't going to behave the same, it wasn't consistent anyway.)