Patch looks good.  We could have also updated the editor to have a 'void' pebble representation so we don't have to deal with void internally, but as this was how we did it before this is the correct change.