Remove hack for $NaN: constant: seems to work now