Simplifying, phase one.

Removed lots of dumb decisions, in favor of generally simpler & smarter ones.

... I think!