Rework options processing stuff to implement option priorities