[analyzer] Address Jordan's review comments for r182058