feat: tie up some loose ends #2735

Job	Run time
linux (5.7-amazonlinux2)	4m 25s
linux (5.7-amazonlinux2)	4m 25s
downstream (macos-12, Xcode_14.0.1, platform=iOS Simulator,OS=16.0,name=iPhone 14)	13m 34s
downstream (macos-12, Xcode_14.0.1, platform=iOS Simulator,OS=16.0,name=iPhone 14)	18m 13s
linux (5.7-focal)	4m 27s
linux (5.7-focal)	4m 27s
downstream (macos-12, Xcode_14.0.1, platform=tvOS Simulator,OS=16.0,name=Apple TV 4K (at 1080p) (...	7m 58s
downstream (macos-12, Xcode_14.0.1, platform=tvOS Simulator,OS=16.0,name=Apple TV 4K (at 1080p) (...	14m 7s
linux (5.9-amazonlinux2)	4m 29s
linux (5.9-amazonlinux2)	4m 29s
downstream (macos-12, Xcode_14.0.1, platform=OS X)	7m 12s
downstream (macos-12, Xcode_14.0.1, platform=OS X)	17m 45s
linux (5.9-jammy)	4m 38s
linux (5.9-jammy)	4m 38s
downstream (macos-13, Xcode_15.1, platform=iOS Simulator,OS=17.2,name=iPhone 15)	13m 39s
downstream (macos-13, Xcode_15.1, platform=iOS Simulator,OS=17.2,name=iPhone 15)	21m 4s
downstream (macos-13, Xcode_15.1, platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generatio...	9m 7s
downstream (macos-13, Xcode_15.1, platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generatio...	14m 40s
downstream (macos-13, Xcode_15.1, platform=OS X)	7m 27s
downstream (macos-13, Xcode_15.1, platform=OS X)	13m 28s
	3h 14m 12s

Provide feedback