Use C-style isnan
Replace uniform initialization with old style constructor calls