Here's version 2 of the patch, mainly to silence compiler warnings
about missing "case" statements from a switch over SubLinkType enum.
Also expanded commit message a little and changed whitespace to be
more consistent with nearby code.
Regards,
Marti