Here and below, we assume that kwargs contains modulestore. Is that correct? Don't we want to defer to the lazyattribute if kwargs doesn't contain modulestore?