video-rice: Use no-ops, comments to remove differences with upstream.