Fix defined? calls for Autoload

Fixes #2706
Remove tags for passing specs