Make some return values less confusing.