Removed pre-variables, enlarged handling of preceding constraints