Smaller code list, less windows, #2132 #2128.