For some reason I have to fix some diverging proof scripts

Coq's module system is wholly inadequate :/

Adding more automation: extracting from a type context. Also, reformulated some of the proof rules, so that they can be applied without the consequence rule.