Simplify limit handling