GPII-547: Removed the "args" property whenever it contained only {arguments}.
GPII-547: Corrected some comments.