Simplify the planner's new representation of indexable clauses a little