Separated ExpressionReference into two

Seriously, when there's two separate sets of fields, it's about time to
separate them.
That said, lists still break right now