Actually, while at it should also fix the signal definition from <!ELEMENT signal (arg,annotation)> into <!ELEMENT signal (annotation*,arg*)>