Fix accidental 'using' and make use of an array initializer