- Further cleaned up NaiveGenerator...