bionic missing pthread_cancel() imposed a welcome refactoring.