Cleaned up xorstream even further