How to avoid putting noses out of joint at historic meeting between China's Xi Jinping and Taiwan's Ma Ying-jeou

As China's Xi Jinping and Taiwan’s Ma Ying-jeou prepare for their historic meeting in Singapore this Saturday, the thorny question of how they will address each other and what etiquette should be observed looms large.
Both are presidents but any suggestion or behaviour inferring that Taiwan is separate state under the “One China” principle will stir up a hornet’s nest.
Taiwan will also want to ensure that its leader Ma Ying-jeou is treated equally and with dignity during the summit with Xi Jinping.
So how will the two leaders get round these difficulties during the meeting?
A few clues may be found by studying a meeting in 1993 in Singapore between semi-official bodies from mainland China and Taiwan which helped thaw icy relations between the two former adversaries.
Koo Chen-fu from Taiwan and Wang Daohan from the mainland took part in the talks and every part of the meeting was meticulously planned.