Make distinction between empty string and None more clear