Francois' review

See my comments in the commit messages.