Cleanup s(:for) compiler