Fixed sloppy usage of CONSP and NULL in conditionals.