Option processing reorganized