Fix a legacy macro issue with 'else' statements