f3853: converted to use delegates. nw.
s2636: converted to use inline configs. nw.