Don't use multiple variable declarations In preparation for #365 on github. Contributed by Graham Russell (graham at ham1.co.uk)