let's fix it up for good

My previous TARGET_USE_O3 brought up some old derps when using O2.