got rid of redundant code, replaced typeinst with inst and typedecl withdecl, regenerated message.out to reflect the changes