golint: avoid using unnecessary make() calls