Fixes #113 (code still needs to be copied to S-Series), and fixes wacky Rail deconversion on RHW x RHW OxDs.