* test for opt->name being non-NULL *before* dereferencing it
* remove unused argument in cleanup_variables()
* simplify