improved class 2-pass analyzer