Fix scanning of +/+=