Comment From: sbrannen

Thanks for the suggestion.

However, the current arrangement is intentional and optimized for performance.

In light of that, we will keep the limited code duplication in place.