Cleanup
Fix args display code so it can code with non-string values.