knock: some more cleanups (refs #2532)


git-svn-id: file:///var/svn/freetz/trunk@12355 149334a1-2f27-0410-a3b9-fc62619ac1e6