Noticed when reviewing #1224 that the usage in the tutorial isn't documented in the API, and this also gives a warning during docs-build...