More AVFoundation cleanups (#611).