Update Relation#update to use new interface
Turn Relation into a proxy
Simplify Relation#order again