move column-alias fixup to statement normalize