Fix up some kinks in compound file construction.