-Fix (#205): macro expansion leads to unintended side-effects