Context now stores its expression instead of segments