Improve how we handle unset module and function names