PR20634: add some more cases that can legitimately come after a struct declaration to our list of special cases.