Fixes to support ApplyType in the obligation/editor. Fixes #12 Fixes #2