start introducing a FedoraResource/NodeService that don't care if the thing is a object or datastream
stop using our custom fedora:* properties where jcr:* properties are good enough
use the nodeService where appropriate.