Change ordering of aggregate factory argument and make it mandatory.