Changed method names (to make them internals), e.g. expand_item_keys to _expand_item_keys.