r6798: Valgrind pain is not something I look forward to - if we ever fall