Does that reference need fixing? I think it doesn't, and that we should inline the two-case version into resolve-once.