Now that we use mirage, we don't need to reach into the pretender server. These references can likely be removed as implied, or in some cases refactored to proper high-level mirage DSL.

Want to back this issue? Post a bounty on it! We accept bounties via Bountysource.