Refactored ExpansionCallback.expand() to accept an Expansion vs. del and mediaType. Added mediaType to Expansion.