Restructure CPLEX decoders; all tests pass now