Use parsed UnitOptions everywhere

All I do is move code around.