Agree; would be good to push it up to the super-class. We can look at doing that in a separate PR though.