In Penknife, did the main refactoring to prepare for condition-guarded aliasing.