Also found a bug in the Form class that would bork phone numbers with dashes in them. Even though the Form class is going to go away eventually I wanted to fix the issue.
Shooting for 100%!