Being more tail call concious...