A few more lines to OsdEvalContext.