Switched to IDless journal files. Minor cleanup.