Fix a long line, with some shorter varnames..