Make some portability improvements identified by Christophe: A few size_t, a couple...