some misc Kaneko refactor, preparation for further work (nw)