A few trivial modifications, starting to do run-time modularization of KF / SSS code.