Revise checks for return_vars names

Hi @nperez

This is the further fix for issue #93 (closed). Please let me know if you have any questions/suggestions. Thanks!

Cheers,
An-Chi