Renamed expand* methods to with* methods to 1) have a more fluent API and 2) remove the notion of expansion - a very JSON-payload-specific concept from the exposed end-user API.