Generalised some contexts.
Merge branch 'master' of github.com:ku-fpg/hermit