Fix for Bug 456312 - Using defined strings as the key for arguments.