Changed trace-define to handle all define syntaxes