Okay, I made Eric's suggested changes and pushed.
This means that multifunction will no longer be automatically turned on
for function 0. This necessitates a change in, e.g. USB 2.0 configs,
where multiple functions on a slot are used - you will need to add
"multifunction='on'" to the <address> element of the device on
function 0.