Additional changes to work with RelEx2Logic