Partial sync up to changes in compat-table format.

Still a few cases which are incorrectly analyzed.