[PATCH] kb* cleanup

[John Levon]

This tidies up kb- handling a bit. please apply.

thanks
john

-- 
"Your superior intellect is no match for our puny weapons."