Mad comment fixups.
Remove extraneous function args.