toOne handles fieldset nicely

Fix for #194.

Fresh branch, single commit.