Make Supply methods picker about what to accept

Specifically as to being called as a class or instance method.