Eng 6590 inline limit for aggregate

Revert strange whitespace changes -- '{' now on their own lines.