Remove some debugging code.
Fix argument access.