Clean up Ke computation and output
Follow minor update of cxxwtils