More work on tidying up expressions.