CA fixes: Use IEnumerable rather array