Fix FORGE-1431 - Actually pass all arguments.