Remove even more multiline var declarations.