Fix #124 and other misuses of conses