Tidying up language extensions