Fix for #616, code gen generated wrong default value for Option columns ...

...(not using Some)

review by @szeiger