Small cleanups; exit fix.