Revert "IN PROGRESS: add opt/c to with-contract and provide/contract"
and "IN PROGRESS: working on syntax error messages for 2d"

This reverts commit bbb0d27e858d7f1da356ca3cf82f71cc31898250.

This reverts commit 14525632508448adeeaa6ce6d60254d70f7d254f.