fixup! -- more test files after rebase
fixup! Make supertypes in lazy type parameters be recorded in order of declaration
Stable order for diagnostics in test