Limit number of dumped raw arguments by 5

It's a good idea to do this because the stack may be screwed up
and the numebr of arguments become be very huge (I wouldn't be
happy to see 500 million arguments on the screen).
Minor code fixes and cleanup