Docs: simplify examples

This depends on #3688, please review that first.