Progress on making tutorials work with the current devel.