Remove single-quote parsing so tsbeval works better; Clean up returned stuff