Changing errant "UnexpectedValueException"s to "InvalidArgumentException"s.