Finished initial (i.e. untested) changes to `comm` and `sentinel`.