Cleanup: replace Arrays.asList() where appropriate