Don't write the same code twice, in two different functions, when they
both call the same initialization function, with the same private_data
pointer info.

Also, note a bug found with a FIXME.
Signed-off-by: Jeff Garzik <jeff@garzik.org>