Fix bogus argtypes.
Merge branch '20130428-tcp-provider' into markj-develop