some improvements to rendering annot type for non-toplevel recursive functions
misc tweaks for matching sym-var binding