Same deal here with `options` being unclear.  Let's get it in a shared module.