Minor cleanup of random code.