Improve rvalue type matching.