Simplify declarations of objects

Where we use arrays of objects or objects that are friendly-names for
array of objects we don't need to be explicit about the naming of
their children.

As per `gofmt`: https://golang.org/cmd/gofmt/#hdr-The_simplify_command