I think I preferred the old code. Pulling bits of logic out of functions into the caller doesn't really document things better, it just leads to code copied all over the place.