Remove array shift optimization for simplicity