Clean up nxsurface.cpp some more