Make compile, reapplying changes to sort_stream, reducing distance to master.