CLEANUP: S3 methods are no longer exported. Only the generics.