rearraged operators and removed superfluous opt-prefix