Created attachment 221501[details][diff][review]
le patch
this should fix it. Steve, can you test with your larger forms?
Parts of the code are not schema placeholder (if a type is defined after a user is found) compliant, this makes them behave again.

Comment on attachment 221501[details][diff][review]
le patch
I do not see something obviously wrong, except for the remarks that Aaron had. But I do not really feel qualified for r+ in that part of the code....