Merge "Add missing calls to `RecordSimplification()`."