2009-02-28: Minor changes to support non-blocking client.