contrib/cfengine.el: cleanup so complete-symbol works again