Update after input from sthen@ and ajacoutot@.