Rewrite plans with Apply/Optional/Expand to use OptionalExpand instead.