Addressing TODOs about class friendship, stack depth, and unused
functions.