Added special handling for T and NIL