improve usage_analyzer a bit