Remaining changes from Francois Ferrand (typz) merged

As before, this is as yet untested.