[analyzer] make a bit less temp vars