Refactoring benchmarking.  Fixed up stream handling to make it consistent among compound encoders and non.