Change based on Yang Tse's excellent fix to reduce buffer overflow risk and

fixing a compiler warning in the append_scopeid() function.