Minor cleanups/reorg.