Refactor to split unbound part.