Fix internal function returns.
More examples.
Make function calls slightly less magical.