Correct handling following introduction of argument.

Change-Id: Iff2a366c52ecab74e5568a308a6d1aec54b3f86e