Move scanner vars inside -analyzer block