Finish off the removal of global variables and fix some typos I made in the constexpr's that meant the CPP was doing less particles than the C version. Now matches.