diff --git a/registry/analyzer.go b/registry/analyzer.go
index 556044fb..340e349d 100644
--- a/registry/analyzer.go
+++ b/registry/analyzer.go
@@ -75,8 +75,8 @@ func (c *AnalyzerCache) DefineAnalyzer(name string, typ string, config map[strin
 func AnalyzerTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range analyzers {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {
diff --git a/registry/char_filter.go b/registry/char_filter.go
index a32488d0..4696713c 100644
--- a/registry/char_filter.go
+++ b/registry/char_filter.go
@@ -75,8 +75,8 @@ func (c *CharFilterCache) DefineCharFilter(name string, typ string, config map[s
 func CharFilterTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range charFilters {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {
diff --git a/registry/datetime_parser.go b/registry/datetime_parser.go
index 2821072a..2cd46e5a 100644
--- a/registry/datetime_parser.go
+++ b/registry/datetime_parser.go
@@ -75,8 +75,8 @@ func (c *DateTimeParserCache) DefineDateTimeParser(name string, typ string, conf
 func DateTimeParserTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range dateTimeParsers {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {
diff --git a/registry/fragment_formatter.go b/registry/fragment_formatter.go
index d5d8ddad..d0121d96 100644
--- a/registry/fragment_formatter.go
+++ b/registry/fragment_formatter.go
@@ -75,8 +75,8 @@ func (c *FragmentFormatterCache) DefineFragmentFormatter(name string, typ string
 func FragmentFormatterTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range fragmentFormatters {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {
diff --git a/registry/fragmenter.go b/registry/fragmenter.go
index e91221c7..18ab2ac0 100644
--- a/registry/fragmenter.go
+++ b/registry/fragmenter.go
@@ -75,8 +75,8 @@ func (c *FragmenterCache) DefineFragmenter(name string, typ string, config map[s
 func FragmenterTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range fragmenters {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {
diff --git a/registry/highlighter.go b/registry/highlighter.go
index b8b7f2e3..b84219ca 100644
--- a/registry/highlighter.go
+++ b/registry/highlighter.go
@@ -75,8 +75,8 @@ func (c *HighlighterCache) DefineHighlighter(name string, typ string, config map
 func HighlighterTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range highlighters {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {
diff --git a/registry/index_type.go b/registry/index_type.go
index 0f501174..17c61f4e 100644
--- a/registry/index_type.go
+++ b/registry/index_type.go
@@ -36,8 +36,8 @@ func IndexTypeConstructorByName(name string) IndexTypeConstructor {
 }
 
 func IndexTypesAndInstances() ([]string, []string) {
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name := range stores {
 		types = append(types, name)
 	}
diff --git a/registry/store.go b/registry/store.go
index 79ee73a9..fc97c082 100644
--- a/registry/store.go
+++ b/registry/store.go
@@ -36,8 +36,8 @@ func KVStoreConstructorByName(name string) KVStoreConstructor {
 }
 
 func KVStoreTypesAndInstances() ([]string, []string) {
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name := range stores {
 		types = append(types, name)
 	}
diff --git a/registry/token_filter.go b/registry/token_filter.go
index d4e38abd..e202e15f 100644
--- a/registry/token_filter.go
+++ b/registry/token_filter.go
@@ -75,8 +75,8 @@ func (c *TokenFilterCache) DefineTokenFilter(name string, typ string, config map
 func TokenFilterTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range tokenFilters {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {
diff --git a/registry/token_maps.go b/registry/token_maps.go
index 589d8095..66ca08fd 100644
--- a/registry/token_maps.go
+++ b/registry/token_maps.go
@@ -75,8 +75,8 @@ func (c *TokenMapCache) DefineTokenMap(name string, typ string, config map[strin
 func TokenMapTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range tokenMaps {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {
diff --git a/registry/tokenizer.go b/registry/tokenizer.go
index c07d5c8d..cb9af643 100644
--- a/registry/tokenizer.go
+++ b/registry/tokenizer.go
@@ -75,8 +75,8 @@ func (c *TokenizerCache) DefineTokenizer(name string, typ string, config map[str
 func TokenizerTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range tokenizers {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {