Updates to switch changes over to using 2 args to support min/max

Switch over from using:
```
number: function (range /*array*/) {
    ...
}
```
to:
```
number: function ([min /*int*/], max /*int*/) {
    ...
}
```
as discussed in #90.