Update normalization to match new arguments.