Be a little smarter about enumeration.