This doesn't seem right to me. If the only thing we need to do is replace octet-stream with octetstream, this should be done on the output of any guesser rather than just this one (and should check to make sure this is not already done). I don't think we need this guesser class added.