Backport reimplementation of -aggregate: from 3.0-development
Minor code style fixes
Use dot syntax
Merge pull request #1270 from ikesyo/backport-aggregate

Backport reimplementation of -aggregate: from 3.0-development