Revert "style fix"

This reverts commit 8bdeaccb5d8f4def384534fb9e460f589fa1c7ef.
fix analysis of recur
collect vars in protocol callsites
emit-form fixes