PR #2: Performance: cheaper Declaration ordering and less evidence-collection a...