I separated it because form-error-highlight is starting to get cumbersome with all the extra processing we do for profiles. I'll see if I can either refactor it to be more concise.