Smarter handling of indexed-from-1