better support for batch-increment_expiration, RT#10453