Fix upgradable_required fields to actually be required in lower level macros