Keep argument order, default to None instead of []
Remove old TODO

We cannot change this while remaining backward compatible. A new method
is required if we want to implement this.