Pull out some redundant variables, add a service that makes the current connection options object available