The "Diverging Clear" and "Diverging Approach" advancedAspect entries are missing "Diverging Clear" and "Branch Clear" ourAspect entries.
The particular case I came across is the first signal mast on a branch has both normal and diverging aspects.
I do not know if "Branch Diverging" also needs to be included.
The added lines are marked with "ds" comments.
Thanks! In SVN. Please download a copy of the file, as I edited in new version info at the front.