Rearrange some options. Indexing is now NOT the default, allowing easier piping, etc.