Removing todo comment, these options are now parameterised.