Use normalized expression + Comments + Cleanup
Fix editable concepts in slightly hacky way

The more complex definition of editable relations makes the duplicated computations more annoying than before.