this one I still had in my pipe.  This greatly streamlines the setup
code.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>