Sam: Refactor macros for form errors.

This is to solve the problem of our error messages breaking for the validation summary.