Change Object references to ContentEntity

Because the List object doesn't inherit in this style, perhaps this would
only build against certain versions of Java.