In Penknife, added refactoring TODOs to prepare for condition-guarded aliasing.