Always restore punctuation variables before returning

One case was introduced in 56ed9f0aca4974eb915fe4e4ebb9666655643df7, the other
was pre-existing.