Bug 14789: Clean up limit structure
3 files changed