Minor renaming of args for better clarity.