(3) Simplify _C wrappers

This relates to issue #313.
Hmm. I understand. So the "net nuissance effect" would be the same.... unless you always use setup / teardown anyway...

As a matter of fact, I wasn't aware that you could then drop the setup / teardown altogether. I'll play around with that a little more.