condensing
condensing
fixup typemacros