Rethink expressions
Merge expression files
More abstract goodness
Rename ConstantValueType to ConstantType
Operators overhaul part two