Fix more problems reported by new codetools. Try to work around the terms(y ~ ., data = data.frame(1:10)) problem in R 2.2.0.
