Calc: Make std::default_random_engine static
Calc: Minor tweaks