Re #1296 Refactoring limit handling.