Rationalize cloud member types a bit.