Make desugaring of formlet placements slightly more robust by using
unification to deconstruct the formlet type.
Merge branch 'master' into sessions

Conflicts:
	desugarPages.ml