Fixed #17644 -- Changed Query.alias_map to use namedtuples

This makes the code easier to understand and may even have a benefit in memory usage (namedtuples instead of dicts). Thanks, lrekucki and akaariai