Rename sort_merge_bs to bs_sort_merge.
Uncomment some assertions that were temporarily commented out during refactoring.