Change getter methods to return arrays, as this is how most client library usages need the options. See gh-34814