Fix remaining automatic field validations.

Need to add enclose="true" to the s:decorate tags.