[dev] More work finishing up conversions to c++11 functors.