Fix some CR feedback on AzureEntityList (gotos! :o)