Update patch set 1
Patch Set 1: Code-Review-1
Looks good. Part of me wants the loading stuff to be factored out into separate classes, but OTOH this only changes the implementation of existing methods, so we can continue punting on that cleanup.
Reviewer: Dave Borowitz <1010008@173816e5-2b9a-37c3-8a2e-48639d4f1153>