Address outstanding comments from PR/47 and other cleanups.