more tidying up of five-limit