Cleanup for review.  Landed some patches.