Change what empty means to be more consistent