Add more test coverage for option descriptions
Raise ArgumentError for argument errors
Remove default argument

This method is called in two places, always with two arguments.
Remove a defensive to_s call

This method is only used internally and we always pass strings.
Spell out the empty string instead of calling to_s on nil
Default to the empty string instead of nil