feat: tie up some loose ends #2701

Job	Run time
linux (focal, 5.7)	6m 59s
apple (macos-12, Xcode_14.0.1, platform=iOS Simulator,OS=16.0,name=iPhone 14)	17m 3s
linux (focal, 5.9)	7m 47s
apple (macos-12, Xcode_14.0.1, platform=tvOS Simulator,OS=16.0,name=Apple TV 4K (at 1080p) (2nd g...	12m 56s
linux (amazonlinux2, 5.7)	6m 35s
apple (macos-12, Xcode_14.0.1, platform=OS X)	14m 51s
linux (amazonlinux2, 5.9)	7m 6s
apple (macos-13, Xcode_15.1, platform=iOS Simulator,OS=17.2,name=iPhone 15)	17m 20s
apple (macos-13, Xcode_15.1, platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (a...	11m 25s
apple (macos-13, Xcode_15.1, platform=OS X)	11m 59s
	1h 54m 1s

Provide feedback