Capped collections: Address Paul's review comments