Converted a few more server requests to the new mechanism.

12 files changed