Add previous lexpand evaluation back in addition to the new version since def-context should be optional