Removed references to arrays, which I thought I'd done already.