More suggestions from Christophe, and bug fixes.
Change log statement.