In Penknife, made progress on some TODOs, but changed only comments and whitespace, not code.