x86: clean up and fix setup_clear/force_cpu_cap handling