Revert "inline ann-form"

This reverts commit 3c2af0fe8e75c9aa22f0e399ad59cc699a14c33c.
Revert "using letfn>"

This reverts commit 0c5ddfae89fe615e4c81aef19aa66e5f07e9b772.
moved aliases to top and better use of coords