Improve typespecs for protocols once more