Octave compatiblity
Support both expanded and single constraints