Enable passing 'attrs' to the field options

and fixed two typos while I was at it, one of them fatal.
Merge branch 'attrs'
We actually need the 'iterable' string later

so use locals() instead
Merge branch 'de-eval'