I completely agree with your analysis that the distinction between immigrant or economic migrant and ex-pat is class-based.