if we're going to add this logic into the MachineState object, let's use it for presentation in fleetctl as well.