Eliminated -Waggregate-return warnings