Refactor with->join branches parsing.