Made Instrument into an indicator.

Instrument no longer inherits from ContextMark.

MILESTONE: ContextMark is no longer functional. No classes inherit from
ContextMark.

Future commits will remove all references to ContextMark. This will simplify
attach and detach code considerably.