tidying Makevars.in*