Convert more function objects across to aggregate initialisation