A couple of minor cleanups prior to publishing tutorial.