[upstream] Fix my snafu in libpaper.