Treat modules and global definitions the same
bump
Check for type null
bump