Monkey-Patching f in for now to make examples work.
minor fixes, non semantic changes
various renames/moves
For testing purposes: Optimizer that issues one invoke call, only.