Some tidying up of expression classes