@ogrisel's suggestion looks good to me.