Repackage constant pool types correctly