Checkpoint before reorganizing namespace imports.
Finished multi-part names.