Remove unused options for style clarity.

Thing is, I don't think we ever explicitly decided before you got here, Aaron. You're sparking the debate for the first time :D