Change a few parameters so their format falls in line with the rest of the code.