Fixed 'nil or nil' style variants