For sure those should be a single constant instead of numeric literals - duplicating literals like that is generally evil, for reasons such as the one we face now.

But I didn't pose the question very well - I'm wondering if the name WAIT_FOR_GWT has any particular significance. It's only that I don't want to propogate a misnomer - is GWT actually involved in everything that we wait on? Or do I want a second constant WAIT_DEFAULT? I don't know the code well enough to say and wouldn't want to make a mess of it. So which of the following best serves the code and its maintainers?

A Use WAIT_FOR_GWT everywhere we do now, and where ever we had a numeric literal timeout value of 5000
B Introduce another constant WAIT_DEFAULT, leave uses of WAIT_FOR_GWT alone as it's a special case
C Use WAIT_DEFAULT everywere, WAIT_FOR_GWT is a misnomer

Thanks,

Brian