Issue #1: increase the shutdown chan's capacity and simplify code