Wrapped fields don't play nicely with validator

[jfengel]

With an unwrapped field, an error is displayed like this:

Wrapped fields include the error indicator in the wrapper, which rearranges the form in an unattractive way: