Fixed var/fn declarations not discerning between class/inter decls and named types