More options cleanup.