FWIW if that's helpful, I am willing to maintain
org\(struct\(++\)?\|tbl\)-mode.

        Christopher