More expansion fixes.