Remove the extra arg, simplify define_(singleton_)method