Style changes
Removed explicit Invalidate event impl - because inherited from base
MapOptionsToNullables improved - more quotation literals