This is not touched by the pull request. Simply because I did not want to change existing API.

But what avoidable "second code branch" are you referring to?