Clearly indicate where we chose one option over the other.
Remove the unused options for clarity.
Merge pull request #7 from cbdr/our-choices

Remove unused options for style clarity.