Minor import/doc cleanup.

Don't need Options anymore as the needed info is getting injected directly. Thanks for the cleanup @Ocramius