Fix #10 - Alternate implementation of setup/teardown support.

Maintains backward compatibility for `return` statement.