Cleaning up StreamAdapter and possibly addressing #726