Fix bad behavior with empty sorts.
Fix @* not working.