It's easier to complain than to fix things, so I will complain now and make a pull request later. This is not an exercise but a remark.  No diagram here. 