This undoes the expander-related changes introduced in !618, to fix regressions such as #1177 and #1184.