Repack arguments structure

Thanks @HalosGhost.