Bugfix
Saner CURSOR-MODE keywords
Add WITH-CONTEXT macro