bug 954: eliminate valgrind warnings