Code cleanup, use generic version of emptyList