Merge pull request #242 from csmith/master

Remove more usages of Server.
Use forEach where possible.