On the encapsulation issue, I've come to think that the natural unit of encapsulation is the module rather than the object.