Reduce metaprogramming

With the latest Julia, I don't get any warning about method ambiguities here. This provides a small boost in loading speed, although it's not as significant as #20. It also simplifies the code.