Remove special cases, range() can handle them