Improvements to Kensaku that make it more generic.