Improve arguments property handling

Also, fix an issue with double enumeration of arguments