Some changes to deal with multi-word last names.