Removed references to ContextMark.