It's the second.  The function doesn't become more complex, but the rest of the code does cleanup.  You'll see in the follow-on PR.