Work on L::LD and L::C refactoring.

Lots more to come.  Got rid of Options, it was just awkward to use.