Resolves Andrews comments on code review