Update handling of generics for barefn/closure, display closures
Add versions template