- eval "require $plugin" or return( 0, $@ );
- return( 0, "Plugin '$plugin' has no method new") unless $plugin->can('new');
+ $plugin->require or return( 0, "Failed to load $plugin" );
+ return wantarray ? ( 0, "Plugin '$plugin' has no method new") : 0 unless $plugin->can('new');