video-rice: Cleanup to make downstream look more like upstream.