Port options from opts format to python and remove two form which C++ corresponding code not guaranteed to work.