ENH: A bit more work on cross-validation.