Hi Efraim,

Thank you for reviewing!

Efraim Flashner <efraim@flashner.co.il> writes:
> Does this build without the extra inputs? If so, can you split this into
> two patches, one for the upgrade and one to add the extra inputs?

Yes, they are independent.