A little more cleanup, then merging back to master.