(temp-commit) more conversion to new type decls
(temp-commit) more conversion to new type decls ...