v.21.9Bug Fix

Fix Column Name Resolution After Alias Rewrite

Fix broken column name resolution after rewriting column aliases. This fixes #26432. #26475 (Amos Bird).