I went down the same train of thought. That's what I was referring to in the PR summary about there may be some sort of way/reason to move the switching mechanism up to PollingCommand itself, but for how small the code is it didn't feel worth spinning my wheels about until we have more examples.