Further Option safety improvements.