Basic problem should be addressed (at least on our main OSes) by the patch checked in.

Ticket 6039 addresses some desirable refinements and cleanup.