After discussion with Standard8, we came to the conclusion that the patch is OK as is, because if it fails, that will be surfacing an actual bug.