Simplify, and ensure we always return an array.

Bug: 12791