clean up a bit of chunky mess
fix up helpers and the recursive test case
ah, that sweet exception-free existence.