BZ-11628: fix up resolve syntax