Cleanup snapshot loader, implement graph resolution handler, etc.