2b34e1224e
This avoids to directly pass the options instance (which contains more data than strictly necessary), and limit the number of parameters for the init function.