Little change to simplify return value.