Fix up the rest of the assignee type parsing