Fix regression in usage tracking due to table alias (self-join? subquery?) support