Fixed issue where value types were not being treated properly in OrDefault() methods