In Penknife, removed the TODO we just satisfied by moving the global functions.