ENG-4895 Respond to review comments and rework stream purging - part trois.