asterisk users - Dec 2011 - AEL2: How to get rid of "does not end with a return; I will insert one" warnings

Hi,

I'm converting to asterisk 1.8 an existing (and lengthy) dialplan
written in AEL2.

I'm using in many places things like

macro foo {
BlahBlah();
return;

catch h {
BlahBlah();
}

};

How can I safely get rid of "does not end with a return; I will insert
one" warnings with such constructs ?

Regards