Rename when-result to cond-result for better clarity
Refactor cond-result not to return anything that would break TCO.