Changed order in which types and decls are decoded.