Shorten line, fix fallback array formatting

Change-Id: I911e69a115bf9c6f5e029626480aa83b63f2c09e