Fix build break caused by Azure Table Storage model being built differently and inconsistently. Will file a bug to follow up on some of this.