core: improve analyzer