WiSaGaN 5 Make macros behave more consistent with try

Latest commit 196c524

Dec 7, 2018