Minor code cleanup, no real progress.