s3: Slightly simplify the logic of completion_remote_filter