More work on expiring channels and workers