Option segfault and usage cleanup

See commit messages for description.