Explicify instruction cntxt.
Fix option missing.