Fix some busted comments and argument names.