XD-1467: Defer access to repo in completion logic

Address review comments