FIX: Fix examples

Closes #524.
Closes #522.

Ready for review/merge.
The change is okay, I didn't make use of Function(str) anywhere in the final version.