force typing via notation in whiskering
Merge branch 'master' into mscs