Unify request construction

Chris Wilson
2016-07-20T13:12:21Z

This deduplicates a lot of code because I only want to fix the bugs
within it once.
-Chris