Refactor client-side directory request code

The old API here involved a function taking 12 arguments, and we were about to add some more to support prop140. Let's simplify matters before we move ahead.