This reverts commit 0f46d81bbb28ea4706d6f3a4e1ce5f69684cf4da.

This reverts commit 33f5d61a65b5bef23ae85254393833c62f6f6215.

Return wrap and proper exit for switch statement type functions.
Also remove no longer used old wrap functions.

Cleaner enter and exit inside of function definition instead of around function calls. Needs exits before all returns by pulling out return value to other variable.
Context created on entry to a function. This mode of singly named context is incorrect (Discussed with Arthur) and will need changing eventually.