Could you separate this change out into a separate PR, as it seems to still require some discussion? All the other changes look good.