Reorganize some last-minute things.