In Penknife, cleaned up the refactoring to prepare for condition-guarded aliasing.
In Penknife, took care of a few easy TODOs.