FORTY: Code cleanup.