Misc: don't depend on optcomp