Some minimal cleanup.