Made context-checking work.