You're completely right, I didn't do that as part of the ForeignKey refactor and forgot to implement in the composite fields branch.

Basically, I wanted the new code to behave as close to the original as possible, which is why I did it inline, but yes, you're right, adding all FOREIGN KEY references separately is going to be needed to do this correctly.