By unifying code paths into one all-args constructor we get less uninitialized variables as well. (cherry picked from commit c8b8deff)
