Sam: Refactor macros for form errors.