Clean up some return values.