Code macro generate 3 new lines in place of 1 in non inline mode

With

Hello...
{{code}}
Google : {{map location="Romania" service="google" size="small" zoom="country"/}} 
Yahoo! : {{map location="10, rue Pernety, Paris, France" service="yahoo" size="small" message="One of the XWiki Offices"/}}
{{/code}}

When rendered in XHTML we see :

• 1 newline between Hello and the code
• 1 newline because the first newline before "Google" is interpreted
• 1 newline because of <p> inside <div>

the first newline is paerfectly normal but the other should be remove:

• the paragraph is not really needed so it can be removed (I was thing the text needed to be inside a parapgraph to be valid XHTML)
• when in non inline mode, remove the first and last newline of code content (this should be done at box macro level)