@rougier it looks like the things implemented here are fixes. @kif can you live with these changes not being a part of your PR, and instead comment on @rougier's PR about them? Or do your examples rely on these definitions?