Switch from RAII to OBRM Terms, expand and improve parts (#322)

[9SMTM6]

This attempts to solve #322.

Since what was to be done finally was still up for discussion I've now mostly followed by opinion, and have not accounted for that of others.

This obviously isnt entirely finished and still needs polishing, but should serve as a basis for discussion.