Working around a case where the PostgreSQL planner is "not smart" (2021)