Followup to the 2007-02-12 patch, using suggestions from Bruno Haible in