pref: cleanup conditions in os.v and arch.c.v

pref: cleanup conditions in os.v and arch.c.v #9090