Reorganize options, make various extensions optional.