BZ-1049368: some small improvements on observable path use