Yeah, sorry for the noise.  It's been a long day, and only halfway over!

But I do think a generic way to distinguish between server (multiple cycles)/non-server (single run) would be good.