~ refactorings, making postExpansion easier to understand.