Bugfix and simplification.

Changes:
 * context option constants moved to Config interface
 * typo fix