Update mpl support and charts to use the new add_* low level functions.

This is on top of #935, so the diff is useless...
I will merge #935 and #961 today and after that it would be readable, so although it is ready, I am labelling as WIP until the afternoon.