Charj: retain more information about class field types