First round of Gray Stream code cleanup.