refactor: move parsing code from types into negotiator classes only