Configure: clean away unused variables and double assignments