Cleanup of how we use BIO/BIO_METHODs