This is a pure refactor, primarily to

• Add a constructor with an options struct. In a future PR I want to add new options, but with the current constructors it would be a pain (i.e., a new constructor).
• Remove the public constructor taking `RequestId`, as this is not used anywhere.

Having an individual PR for this will reduce the noise of future work, and also doesn't depend on any other changes to submit.