analyzer: minor cleanup