Regularized indicator storage.

All indicators are now stored in indicator wrappers.

This was previously only true of "scoped indicators" (ie, the old context
marks).

This is now true for "nonscoped indicators" as well.