Broke a bunch of stuff about ExpressionReference

Too lazy to write all of ExpressionReference, but not sure how to deal
with it myself