Function body macros

This is the reason why SE-0385 was returned for revision.

Doug