Properly handle all X-Ray Wrapper cases.