Comments
Replace empty lists with Nil