Improved dictionary accessors, but types are now messier.