Switch RandomGenerator and SHAGenerator to use "using" notation for cleanliness