Fix backporting @@var@@ lines.