minor semantic analyzer cleanup