Bugfix: Do ensure we do not already have an array before forcing the value
to be an array.
Code style.